This can be improved in the future but works for now. Closes #53