Replaced and rearranged a few things since my last post