Status is now an integer, also removed irrelevant stuff