Made more changes to positioning code to support wrapping, not fully functional yet. #5