Fixes #33 and gets everything sorted with the radar